Skip to content

Commit

Permalink
[0.74] Integrate react-native 0.74.0-rc.9 (#12939)
Browse files Browse the repository at this point in the history
* integrate rc8

* Change files

* integrate rc9

* disable node tests
  • Loading branch information
TatianaKapos committed Apr 16, 2024
1 parent 726222b commit c13ef9d
Show file tree
Hide file tree
Showing 26 changed files with 171 additions and 281 deletions.
8 changes: 4 additions & 4 deletions .ado/stages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ stages:
buildEnvironment: ${{ parameters.buildEnvironment }}
AgentPool: ${{ parameters.AgentPool }}

- template: jobs/node-tests.yml
parameters:
buildEnvironment: ${{ parameters.buildEnvironment }}
AgentPool: ${{ parameters.AgentPool }}
# - template: jobs/node-tests.yml
# parameters:
# buildEnvironment: ${{ parameters.buildEnvironment }}
# AgentPool: ${{ parameters.AgentPool }}

- template: jobs/macos-tests.yml

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate rc9",
"packageName": "@office-iss/react-native-win32",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate rc9",
"packageName": "react-native-windows",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.74.0-rc.6",
"baseVersion": "0.74.0-rc.9",
"overrides": [
{
"type": "patch",
Expand Down
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.74.77",
"@react-native/tester": "0.74.80",
"@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.74.0-preview.2",
"react": "18.0.0",
"react-native": "0.74.0-rc.6"
"react-native": "0.74.0-rc.9"
},
"devDependencies": {
"@office-iss/react-native-win32": "0.74.0-preview.2",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.74.0-rc.6",
"react-native": "0.74.0-rc.9",
"react-native-platform-override": "^1.9.25",
"typescript": "5.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.74.0-rc.6",
"baseVersion": "0.74.0-rc.9",
"overrides": [
{
"type": "derived",
Expand Down
20 changes: 10 additions & 10 deletions packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
"@react-native-community/cli-platform-android": "13.6.4",
"@react-native-community/cli-platform-ios": "13.6.4",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.74.77",
"@react-native/codegen": "0.74.77",
"@react-native/community-cli-plugin": "0.74.77",
"@react-native/gradle-plugin": "0.74.77",
"@react-native/js-polyfills": "0.74.77",
"@react-native/normalize-colors": "0.74.77",
"@react-native/virtualized-lists": "0.74.77",
"@react-native/assets-registry": "0.74.80",
"@react-native/codegen": "0.74.80",
"@react-native/community-cli-plugin": "0.74.80",
"@react-native/gradle-plugin": "0.74.80",
"@react-native/js-polyfills": "0.74.80",
"@react-native/normalize-colors": "0.74.80",
"@react-native/virtualized-lists": "0.74.80",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand Down Expand Up @@ -69,7 +69,7 @@
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/eslint-parser": "^7.20.0",
"@react-native/metro-config": "0.74.77",
"@react-native/metro-config": "0.74.80",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.9",
"@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.13",
Expand All @@ -85,14 +85,14 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "18.2.0",
"react-native": "0.74.0-rc.6",
"react-native": "0.74.0-rc.9",
"react-native-platform-override": "^1.9.25",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "18.2.0",
"react-native": "0.74.0-rc.6"
"react-native": "0.74.0-rc.9"
},
"beachball": {
"defaultNpmTag": "preview",
Expand Down
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": "18.2.0",
"react-native": "0.74.0-rc.6",
"react-native": "0.74.0-rc.9",
"react-native-windows": "0.74.0-preview.2",
"typescript": "5.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-native-windows/tester/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win/**"
],
"baseVersion": "0.74.0-rc.6",
"baseVersion": "0.74.0-rc.9",
"overrides": [
{
"type": "derived",
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-native-windows/tester/package.json
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": "18.0.0",
"react-native": "0.74.0-rc.6",
"react-native": "0.74.0-rc.9",
"react-native-windows": "0.74.0-preview.2",
"react-native-xaml": "^0.0.78"
},
"devDependencies": {
"@react-native/tester": "0.74.77",
"@react-native/tester": "0.74.80",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.9",
"@rnw-scripts/just-task": "2.3.25",
"@rnw-scripts/ts-config": "2.0.5",
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.74.0-rc.6",
"react-native": "0.74.0-rc.9",
"react-native-platform-override": "^1.9.25",
"react-native-windows": "0.74.0-preview.2",
"typescript": "5.0.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native/monorepo/overrides.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"baseVersion": "0.74.0-rc.6",
"baseVersion": "0.74.0-rc.9",
"overrides": [
{
"type": "patch",
"file": "package.json",
"baseFile": "package.json",
"baseHash": "63d4e653c3249a911370436b6cd366c614fd125a"
"baseHash": "82a51585963d4dbfd6fdf7e69b059b8b2db5246e"
}
]
}
4 changes: 2 additions & 2 deletions packages/@react-native/monorepo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,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.74.77",
"@react-native/metro-config": "0.74.77",
"@react-native/metro-babel-transformer": "0.74.80",
"@react-native/metro-config": "0.74.80",
"@tsconfig/node18": "1.0.1",
"@types/react": "^18.2.6",
"@typescript-eslint/parser": "^6.7.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native/tester/overrides.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"baseVersion": "0.74.0-rc.6",
"baseVersion": "0.74.0-rc.9",
"overrides": [
{
"type": "copy",
Expand Down Expand Up @@ -523,7 +523,7 @@
"type": "copy",
"file": "package.json",
"baseFile": "packages/rn-tester/package.json",
"baseHash": "1e3416b6f997b7950766178682fd2509bb005f02",
"baseHash": "ea47db91279ce5454bdf94e8f4ddcc1cab2e2d61",
"issue": 4054
}
]
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native/tester/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-native/tester",
"version": "0.74.77",
"version": "0.74.80",
"private": true,
"description": "React Native tester app.",
"license": "MIT",
Expand All @@ -26,7 +26,7 @@
"flow-enums-runtime": "^0.0.6",
"invariant": "^2.2.4",
"nullthrows": "^1.1.1",
"@react-native/popup-menu-android": "0.74.77"
"@react-native/popup-menu-android": "0.74.80"
},
"peerDependencies": {
"react": "18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@rnw-scripts/babel-react-native-config/package.json
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.74.77",
"@react-native/babel-preset": "0.74.80",
"babel-plugin-transform-flow-enums": "^0.0.2"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@react-native/babel-preset": "0.74.77",
"@react-native/babel-preset": "0.74.80",
"eslint": "^8.19.0",
"prettier": "2.8.8"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@rnw-scripts/eslint-config/package.json
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.74.77",
"@react-native/eslint-config": "0.74.80",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ft-flow": "^2.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@rnw-scripts/metro-dev-config/package.json
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.74.77",
"@react-native/metro-config": "0.74.80",
"@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
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": "18.2.0",
"react-native": "0.74.0-rc.6",
"react-native": "0.74.0-rc.9",
"react-native-windows": "0.74.0-preview.2"
},
"devDependencies": {
Expand All @@ -31,7 +31,7 @@
"@babel/runtime": "^7.20.0",
"@react-native-windows/automation": "^0.3.214",
"@react-native-windows/automation-commands": "^0.1.234",
"@react-native/metro-config": "0.74.77",
"@react-native/metro-config": "0.74.80",
"@rnw-scripts/babel-node-config": "2.3.2",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.9",
Expand Down
4 changes: 2 additions & 2 deletions packages/e2e-test-app/package.json
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": "18.2.0",
"react-native": "0.74.0-rc.6",
"react-native": "0.74.0-rc.9",
"react-native-windows": "0.74.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.214",
"@react-native-windows/automation-commands": "^0.1.234",
"@react-native/metro-config": "0.74.77",
"@react-native/metro-config": "0.74.80",
"@rnw-scripts/babel-node-config": "2.3.2",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.9",
Expand Down
6 changes: 3 additions & 3 deletions packages/integration-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
},
"dependencies": {
"@react-native-windows/automation-channel": "^0.12.132",
"@types/react": "^18.2.6",
"@react-native-windows/fs": "0.74.0-preview.1",
"@types/react": "^18.2.6",
"@typescript-eslint/eslint-plugin": "^5.21.0",
"@typescript-eslint/parser": "^5.21.0",
"chai": "^4.2.0",
"react": "18.2.0",
"react-native": "0.74.0-rc.6",
"react-native": "0.74.0-rc.9",
"react-native-windows": "0.74.0-preview.2"
},
"devDependencies": {
Expand All @@ -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.74.77",
"@react-native/metro-config": "0.74.80",
"@rnw-scripts/babel-node-config": "2.3.2",
"@rnw-scripts/eslint-config": "^1.2.9",
"@rnw-scripts/just-task": "^2.3.25",
Expand Down
4 changes: 2 additions & 2 deletions packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
"@typescript-eslint/eslint-plugin": "^5.21.0",
"@typescript-eslint/parser": "^5.21.0",
"react": "18.2.0",
"react-native": "0.74.0-rc.6",
"react-native": "0.74.0-rc.9",
"react-native-windows": "0.74.0-preview.2"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/runtime": "^7.20.0",
"@react-native/metro-config": "0.74.77",
"@react-native/metro-config": "0.74.80",
"@rnw-scripts/babel-react-native-config": "0.0.0",
"@rnw-scripts/eslint-config": "1.2.9",
"@rnw-scripts/just-task": "2.3.25",
Expand Down

0 comments on commit c13ef9d

Please sign in to comment.